Doc fix for current-time-string and date-to-time (Bug#5408)

* src/editfns.c (Fcurrent_time_string): Doc fix.
* lisp/calendar/time-date.el (date-to-time): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e7d50e0c7b38f892ea0eafbe55ef98a09f47c32..91ff48b30cd0585bd63de1b33054bb308d48e89c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-18  Chong Yidong  <cyd@stupidchicken.com>
+
+       * calendar/time-date.el (date-to-time): Doc fix (Bug#5408).
+
 2010-01-18  Juanma Barranquero  <lekktu@gmail.com>
 
        * cedet/ede/locate.el (ede-locate-file-in-project)

diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 3b4495881f691f6a4b013f86d12edf5192a4386e..914d2d33928473067a73c2a4c12e28e485c3c437 100644 (file)
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -98,7 +98,8 @@ and type 2 is the list (HIGH LOW MICRO)."
 
 ;;;###autoload
 (defun date-to-time (date)
-  "Parse a string DATE that represents a date-time and return a time value."
+  "Parse a string DATE that represents a date-time and return a time value.
+If DATE lacks timezone information, GMT is assumed."
   (condition-case ()
       (apply 'encode-time
             (parse-time-string

diff --git a/src/ChangeLog b/src/ChangeLog
index 74548a12d2feb07db76ea1c70b1e7ea8f291ba4f..17639cd6ee4814e33a9db4341a4106e07e2899cc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-18  Chong Yidong  <cyd@stupidchicken.com>
+
+       * editfns.c (Fcurrent_time_string): Doc fix (Bug#5408).
+
 2010-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * xterm.c (event_handler_gdk): Block input (Bug#5037).

diff --git a/src/editfns.c b/src/editfns.c
index 00ac0ca0fa99ff574ea01f7c2362c2ae535aac17..093f141bff21d1ff35a41fc8a02d9ff98f7f40db 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1897,7 +1897,7 @@ usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE)  */)
 }
 
 DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0,
-       doc: /* Return the current time, as a human-readable string.
+       doc: /* Return the current local time, as a human-readable string.
 Programs can use this function to decode a time,
 since the number of columns in each field is fixed
 if the year is in the range 1000-9999.